x86/mm: remove incorrect BUG_ON.
authorTim Deegan <Tim.Deegan@citrix.com>
Wed, 24 Nov 2010 10:20:03 +0000 (10:20 +0000)
committerTim Deegan <Tim.Deegan@citrix.com>
Wed, 24 Nov 2010 10:20:03 +0000 (10:20 +0000)
This BUG_ON tests a property of an effectively random PFN in the guest,
and is explicitly _not_ seeing the MFN that's known to be owned.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
xen/arch/x86/mm/p2m.c

index 04df68c5154a99e215c922385d00ffe672f2d054..847a59ad66d4478b31e0ee8e8a3a5a7efe805d74 100644 (file)
@@ -2380,9 +2380,6 @@ guest_physmap_add_entry(struct p2m_domain *p2m, unsigned long gfn,
             P2M_DEBUG("aliased! mfn=%#lx, old gfn=%#lx, new gfn=%#lx\n",
                       mfn + i, ogfn, gfn + i);
             omfn = gfn_to_mfn_query(p2m, ogfn, &ot);
-            /* If we get here, we know the local domain owns the page,
-               so it can't have been grant mapped in. */
-            BUG_ON( p2m_is_grant(ot) );
             if ( p2m_is_ram(ot) )
             {
                 ASSERT(mfn_valid(omfn));